Merge branch 'master' of https://github.com/coinos/coinos-ui into notificationsnotifications

1 files changed, 21 insertions, 8 deletions

diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index c68cfecc..d6cf3984 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -1,22 +1,35 @@
 import { auth, get } from '$lib/utils';
 
 export async function load({ cookies, params, parent, url }) {
-	let { subject } = await parent();
+	let { user, subject } = await parent();
 	let { pubkey } = subject;
+	let { since = 0 } = params;
 
-	let events = [];
+	let messages, invoices, sent, received;
+	messages = invoices = sent = received = [];
+
+	if (user) {
+		try {
+			messages = await get(`/${user.pubkey}/${since}/messages`);
+			messages = messages.sort((a, b) => b.created_at - a.created_at);
+		} catch (e) {
+			console.log(`failed to fetch nostr messages`, e);
+		}
+
+		({ invoices, sent, received } = await get('/requests', auth(cookies)));
+	}
+
+	let notes = [];
 
 	try {
-		events = await get(`/${pubkey}/notes`);
+		notes = await get(`/${pubkey}/notes`);
 	} catch (e) {
-		console.log(`failed to fetch nostr events for ${pubkey}`, e);
+		console.log(`failed to fetch nostr notes for ${pubkey}`, e);
 	}
 
-	events.map((e) => {
+	notes.map((e) => {
 		e.seen = e.created_at;
 	});
 
-	let { invoices, sent, received } = await get('/requests', auth(cookies));
-
-	return { invoices, events, sent, received };
+	return { invoices, messages, notes, sent, received };
 }